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

Change-Id: I8bbfe7d531797e9c93ce49aa0f41e925d7f041f9