Merge "Stop enforcing the AOSP preupload hook"