Merge "Update PREUPLOAD hook to use atest prebuilt"
am: 81806d8791

Change-Id: Iefb2a437be5b1ee402e990d8b9c018c2791187db