Import changes from an internal repo.

* Fix broken clipping result
* Fix invalid format-type pair in readPixels()

Change-Id: I996a9c5b340ae4d455219e57ff16d2b1456b015c
2 files changed