Merge "ART: Clean up asm_support.h" am: a74c04b3c7
am: 0187263423

Change-Id: Ie39743ce5f3572f23468daebee5fdedb5138e5cc