Merge "ART: Extract macro assembler"
am: 95a976a3d1

Change-Id: I7b4e1d4900e6271a3d7ffc7cacd0c5876a3a2474