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

Change-Id: I93c27c2dc3c4a4d8bf7cb783c449e285486bcc31