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

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

Change-Id: I0e3816057ecd94461f7e291fc9033b98bc8b9dc3