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

Change-Id: Idd1cf9bbffb15bfdab59c9b2e80cb31b477ce0cf