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

Change-Id: I904b8117713e3d6b6a6333396313e050f1482324