Merge "Make libbcinfo buildable for native_bridge" am: 382efa3f0d am: de2bb26a85

Original change: https://android-review.googlesource.com/c/platform/external/clang/+/1354222

Change-Id: I7081daa7216226fe5cd7a0ba2ce191e6f0640be6