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

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

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