Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 6e595bb5 am: bfc1737d am: 35647245 -s ours am: f010d28a -s ours Change-Id: Ibc037c3a06849b0067e15f3032f91e078a1cd6f6