Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554  -s ours am: 053c2547df am: 3be236000f am: 10405d7838 am: 03b8ef2b6f am: 7a804246f6
am: 7ddb92f0e6

* commit '7ddb92f0e65fa3cf9c45ff68d109020b26d86594':