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

Change-Id: I7716d015717044122985f606bf78c55229691dc4