Merge "Tweak download-libs.sh to be more consistent with 3.6.1/Android.mk" am: d96c2d1f am: 63c5e324 am: e1b00635 Change-Id: Id02700fe83bfa836433d10d846442e0f68cb0e46