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

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