Merge "Use non vixl arm macro assembler"
am: 8662aaaae4

Change-Id: Ib11edf85220a6d09f0875b5854fd276328bb836d