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

Change-Id: Ia6cebb2413fcb4dc7aefbbd8ea589926512a5683