Merge "Move Mips to integrated assembler" am: e99d2e8829 am: d060c6a838
am: 5681a4eff7

Change-Id: I53f173ca0ff0520b2680b7ec56ae4f4f0c689239