Merge "Prebuilts update script now uses proper target" into qt-dev
am: b93b4fa527

Change-Id: Ib5234297e000adf20888ffda3f2f15f0d749c850