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