Switch to aosp-build-tools-release am: 60a0c4153a

Change-Id: I23c58d1ad1cfc0cd1876278d80a136b50fff3f38