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

Change-Id: Ib66ddf53cbe91d2064f6268f9115cd577883acae