am 5c49a908: Merge change Ic73ec39b into eclair

Merge commit '5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-plus-aosp

* commit '5c49a9080df9e46193efa8326318c86bc8976eea':
  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.