Merge "Fix mips build"
authorCalin Juravle <calin@google.com>
Wed, 26 Feb 2014 21:34:56 +0000 (21:34 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 26 Feb 2014 21:34:57 +0000 (21:34 +0000)

Trivial merge