am 0c2da971: am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev

* commit '0c2da9719bde37305c5724e54f97a8f61c7e8d0b':