Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 55498fa33b am: b2547660bd am: 34890f1112  -s ours
am: 90bd476897  -s ours

Change-Id: I43c50cf16c403bf35c5d53137b41386e3b6265e4