Merge "Fix mips build"
am: f94563540f

Change-Id: I58754821be0c1a3d341da9907d4234b8d70a9b6a