am e6c34f89: (-s ours) am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev

* commit 'e6c34f8990e3560c3d65ec9c15cf6cd39fbc8f2a':