Merge "Declare the headers of the ndk_library" am: ee56ce65be am: 589ef2ae13 am: 3622609bde

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

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