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

Change-Id: Ib818daa7205d61a577ae7be30c6c01562546d22f