Merge "Declare the headers of the ndk_library" am: 2167e10a98 am: 276cc2c581

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

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