Merge "Remove llndk_headers module" am: aaf8e170a6 am: b86e54d22b

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

Change-Id: I0a6462d9bcaa84bb45b2c91f0ceb518102fd889f