Tweak download-libs.sh to be more consistent with 3.6.1/Android.mk

This also involved alphabetially reordering some dependencies in
3.6.1/Android.mk to be consistent.

Note: 3.6.1/PREBUILT/download-libs.sh is still inconsistent. This
CL doesn't deal with that additional inconsistent copy.

Test: After the follow-up CL,
         make StorageManagerRoboTests
      now builds. It wouldn't have built without this CL.
Bug: 116872534

Change-Id: Ie695da71200c2e27ae7beb4816fde12c365eee0f