Merge "CTS-5.1_r3 : Fix testBadSurfaceDimensions" into lollipop-mr1-cts-dev