Merge "Update PREUPLOAD hook to use atest prebuilt"