am 3d2f94f5: am 8ad223e5: am 8f92e3e6: Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev

* commit '3d2f94f576ca517185db27eb3550636415695036':
  Revert "Changed the size of MockView according to resolution."