Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59b am: 668e886d4d

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805

Change-Id: I1dbeafd01a1dae4f9891a93f6ccf7b37b8a8df52