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

Change-Id: I187ee1234b648e4a6174ac71e376a705c3403df4