Merge "dx: Update prebuilts with a version that is built for 1.7"