Fix bpfmt issues and add bpfmt to preupload checks

Test: m nothing
Change-Id: I10526a33685335bdd26cc7692815133379d4e0f6
diff --git a/scripts/Android.bp b/scripts/Android.bp
index 1f55030..7f2ddb8 100644
--- a/scripts/Android.bp
+++ b/scripts/Android.bp
@@ -106,7 +106,7 @@
         py3: {
             enabled: false,
         },
-    }
+    },
 }
 
 python_binary_host {