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

Change-Id: I011b16eb3c7ee21a52a04586d8249254e8d53dc8