Merge "Fix mips emulator boot"
am: 557eae2175

Change-Id: I8207e6e48ea8867ed77f534e886aeb7f9c5419db