(cherry picked from commit ce014ac7)

Conflicts:
	download.lst
	external/libvisio/UnpackedTarball_libvisio.mk

Change-Id: Ia4cb506a95a150b8106187719e9104760409dea6