Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794 am: c0fbad2b2b
am: dacd341a7a  -s ours

Change-Id: Ib3ef2713736a0f0d52766f0ec331f54b4528d7c1