Merge "Add more libs into generic AOSP system image" into oc-dev