Merge "ART: Update arm assembly to use current syntax"