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

Change-Id: Ide6db0c1ceb6254a2279ca277a2b8a9dbd67b9b7