Merge changes I42c47d98,If38ad50d

* changes:
  Fix mac build
  bpfmt -w $(find . -name Android.bp)