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

* commit 'fd409de54c59fda03453f4b1558aa82679b891af':
  ART: Update arm assembly to use current syntax