Merge "bpfmt -w Android.bp"
am: c51996859d

Change-Id: I4fcfe15d94114e327df91c3e6ada261929727b63