Merge "Fix mips build." am: 97ba18ed7f
am: 36f46cd915

Change-Id: I526fc8af06ca8fbeadc17dc518542a3a5f21230c