Merge "Declare the headers of the ndk_library" am: 7ef86f3456 am: c110511a08 am: e8c4db807b am: 236aaa4443 am: 86c33805e1

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

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