Merge "Declare the headers of the ndk_library" am: 12b528b0 am: c2460ec6 am: f30357aa

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



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