am 9737dc4d: am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair

Merge commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325' into eclair-mr2-plus-aosp

* commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325':
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.