Make it build under Android
am: a768648acb

* commit 'a768648acbcc235ca6d31993cacec8cca68843a4':
  Make it build under Android