Fix-up coding style and add PREUPLOAD.cfg file. am: 4b6a634e48
am: 46bb1ed634

Change-Id: I11757a7698d1092cfdd053296d2fabe3b84796be