Merge "Remove AOSP preupload hook." into main