Merge "ART: Clean up asm_support.h"