am e21d7ae8: Merge "Remove obsolete BUILD_TINY_ANDROID."

* commit 'e21d7ae89e91a1f6797b74bf7f744b87eb6d2148':
  Remove obsolete BUILD_TINY_ANDROID.