Merge "Use asm-5.2 prebuilts"
am: 956ee36d17

Change-Id: I6ed15e497b388572e8be9ea203c790e65b093b1c