Merge "Fix mips64 build" am: 1012fba454
am: c3a9f10f93

Change-Id: I82aa170bb63837a3f127f2a42e10f7e38aacb4b8