Merge "bpfmt -w Android.bp" into sc-dev