Use builtin bpfmt preupload check am: 1cf31fe277
am: 0f223a5005

Change-Id: I6dd9162eda1a227ba4237a64315419d6622fcfb8