Merge "Declare the headers of the ndk_library" am: 12b528b052 am: c2460ec622

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

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