Merge "toolchain/Android.bp bpfmt" into main