Merge "Move Mips to integrated assembler"
am: e99d2e8829

Change-Id: I0a5ff8b12a4c0a750e14553ccaafdb66a1a32a3a