Merge "Don't assume all downloaded files are under top-level Download dir." into qt-dev
am: 1c54f85d35

Change-Id: I5f635337fe1ca9e8560b40687fa36688a5e5e4cd