Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES. am: 55dda5a695
am: 92a5818105

Change-Id: Id3a4b8f8271d72f6f75cf472ed24624268e65786