Merge "Add PREUPLOAD.cfg AOSP check"