Merge changes I42c47d98,If38ad50d

* changes:
  Fix mac build
  bpfmt -w $(find . -name Android.bp)
tree: b9fa351036d2085c82e1dd29638e55f33f592e87
  1. NOTICE
  2. embdrv/