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

Change-Id: Iae8cef495cc63575bb949d3cd3439a0abecc8fc4