Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4
am: 934091ba0f

* commit '934091ba0fc931e18dd3929089c21ff13446b565':