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

Change-Id: I77d2e252770f499bb73ac6caec48926ac026737f