Merge "Fix mips64 build"
am: 1012fba454

Change-Id: I7073eb2ebb8fade3c3bec2d89f42703a419d17a9