Merge "Fix mips64 build"
am: 24276374dc

Change-Id: I28b1fe38ac981e6f77c1a94bec5291deea804ba3