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

Change-Id: Ibd76e6f50423a59a6388d0b85a9f5a3c992b7681