Merge "Fix mips64 build" am: 669aa6239f am: 07ffc9c8b8
am: a2a3349bd5

Change-Id: Ic5fd0bc5ed43e76cdea422befde79a29e5a88025