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

Change-Id: I51705af4ec8555a19bb5260ad994a41e2498e25a