am 70c822e7: am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...

* commit '70c822e7106ac97a1a2b4e5d404e54efc34ad344':
  fix TINY ANDROID yet again...