Merge "bpfmt -w Android.bp"