am 65f4effc: Merge "Discard the correct buffer when the bound FBO is not 0"

# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '65f4effcab1f4bb6e2e96a2b8eb2c774601b87db':
  Discard the correct buffer when the bound FBO is not 0