Merge "Use asm-5.2 prebuilt"
am: 6b32770d6d

Change-Id: I7dc856be1a10ea7a65c7b3f889b37d9afaadbd5c