Merge "[BP CLEANUP] Format bpfmt -s in system/*" GitOrigin-RevId: 6f2f31c3c26ebae9c2e2258bdbc81517538a2457 Change-Id: Idb44e271e0d54c90b6a4d3510eb1afad4707f01e