Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 4e80c0077a am: cc18302254
am: 1fa0018df5  -s ours

Change-Id: Ideaa5044d2900db42fc4887a04c22bd7e18a3e4f