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

Change-Id: Ia0e45769e3b77be2e0381233f99618d39fbdf57b