Merge "fixed mockview" into kitkat-cts-dev