Without this the build fails on x86. Change-Id: I3166bfb63bc754fc81acd89eeb7e4c729de58ee4
mentioned in commit 76f55a3e