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

Change-Id: Ie447929a9b95760246c5b029c073a5c207c5b91e