Merge "PREUPLOAD.cfg: enable bpfmt"
am: 97247c42bd

Change-Id: I64ba8226357323a1cc803f8c160aa5156dfe3c22