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

Change-Id: I86941bf9e7b6e6539b514159e04d7399ce50643a