Merge "Run bpfmt on api/Android.bp"