am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread

* commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55':
  DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.