Merge "Add more libs into generic AOSP system image" into oc-dev
am: 57fb2214ab

Change-Id: If56dc8c2a6417b527c243af0151b428677f16f55