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

Change-Id: I5f6d29e1e6d2710fe5b119d8fd1a470fbdf0d8cd