Merge "Remove .(ll)ndk suffix from (ll)ndk_library" into oc-dev