Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
am: 4e80c0077a

Change-Id: I7796091eae2ea72c27bf5b74e5c607dda355ca6a