Merge "Declare the headers of the ndk_library" am: 2167e10a98 am: 276cc2c581 am: 3e4290a5f3 am: 289367533f am: c59f3a200d

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

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