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

Change-Id: Ifbc1d7a5d4910ebf384867b032b7bfd71b5c8b68