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

* commit '678c7ac997ba5daf09664d3e9b26f1c4a493b99e':
  fix TINY ANDROID yet again...