Merge "Fix mips build."
am: 97ba18ed7f

Change-Id: I6e5693234966ce8307376796fc9ceb6d2396a9b6