Merge "CTS-5.1_r3 : Fix testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: 42509829fb  -s ours
am: 62c8423142

* commit '62c842314205d2866be0bd89fd6a68fcd7910ab9':
  CTS-5.1_r3 : Fix testBadSurfaceDimensions