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

Change-Id: Id0c11e89bcc70a5391e1a15c22a28dd9eadbed5a