Merge "Introduce uses-native-library tag" am: e6c21e2ea8 am: 64f6fa6fb9 am: 41521641c1 am: 590462e110

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372059

Change-Id: I46f8c3e9c8335c82fec61725faa25bb3675fc54d