am c7edf2b0: am 0a4962ad: Merge "make Surface.java internal state thread-safe" into jb-mr2-dev

* commit 'c7edf2b033b5119f9a78e48fe07e88e02de84bdc':
  make Surface.java internal state thread-safe