Merge "bpfmt native/android/Android.bp" am: b33f9df49c am: f91d043cfc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684528

Change-Id: I5657c340dc381858e5f2edddc6ee8c515e01b4b5