am 1be720b5: am a32fd0e2: Merge "remove uses of Surface in favor or...
am 1be720b5: am a32fd0e2: Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
* commit '1be720b5':
remove uses of Surface in favor or IGraphicBufferProducer