Merge "Merge "Add more libs into generic AOSP system image" into oc-dev am:...
Merge "Merge "Add more libs into generic AOSP system image" into oc-dev am: 57fb2214 am: 4a421a28" into oc-dr1-dev-plus-aosp
am: a50f7487
Change-Id: I012c33af66d201799b0471fb99260daaf056ca6a