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

Change-Id: If8fe94fc9df97e85e8320181076795a97919ab2f