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

Change-Id: Ic5d1e7f97103d41ffb48d672dce4c195b09f77f4