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

Change-Id: I12ed264f5c29d56c4cb73cb02aee293c73be6686