Merge "[DO NOT MERGE] Support native shared libs" into oc-dev am: 324c41ba89  -s ours
am: 2ff9a77549

Change-Id: Idc19693a864d0826df08ee5b5307142f370bca1c