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

Change-Id: Iffefb631653a13b7c0d334aadffe30010114b10d