Merge "Fix mips64 build"
am: 669aa6239f

Change-Id: Ie3ef0b4fe513096f521080ad3545b332992d21cd