am 55f71bc0: Merge "Replace IInterface::asBinder() with a static"

* commit '55f71bc0800b9ec7a779c5d30d5a90e074c2526b':
  Replace IInterface::asBinder() with a static

diff --cc libs/gui/BufferQueueProducer.cpp
Simple merge

diff --cc libs/gui/ISurfaceComposer.cpp
Simple merge

diff --cc libs/gui/LayerState.cpp
Simple merge

diff --cc libs/gui/StreamSplitter.cpp
Simple merge

diff --cc libs/gui/tests/BufferQueue_test.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge