Merge "Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES."
am: 569bcb26d0

Change-Id: I72c2a0c4ac679f5ae50fe973960cdb27094c4397