Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES.
am: 55dda5a695

Change-Id: Id3026aa894b98b4d4b301419ab2b61aa995111a5