Merge "Remove .(ll)ndk suffix from (ll)ndk_library" into oc-dev am: 62abe8f802
am: 374a122ae9

Change-Id: I59ef69be07825f3e5ed60a497f57810d64919892