Merge "Add sample_updater style check to PREUPLOAD.cfg"
am: 73e6644777

Change-Id: I5acb461de5e0af89ffc903363711d9bb0dc05bc1