Merge "dx: Update prebuilts with a version that is built for 1.7" am: 6f6b5641b5 am: beb3c7b2a1
am: 4019526fb1

Change-Id: If895c2b35367bd360fed2301090353366a1227f7