Merge "Declare the headers of the ndk_library" am: 7ef86f3456 am: c110511a08

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2212875

Change-Id: I88a840726f416b9b052325ef70dfdb6550dd70d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>