Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 4e80c0077a
am: cc18302254

Change-Id: I2f9d38d79b2907e0354140e7f6a80e32e2f6676b