Merge changes Iec406b73,I18aa6aa5

* changes:
  Run bpfmt
  Simplify Android.bp files