Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev