Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
am: bac3bcd13c

Change-Id: I24a008090c05ccc994bce22eb73348e5de8cf0c2