Merge "Fix mips build." am: 97ba18ed7f am: 36f46cd915
am: 1f18c34ed1

Change-Id: I9eed8e0a645f2bbe8895dead2c9b38229cc2b1d1