am 5230c23a: am c780339f: am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110

* commit '5230c23ab1d3be91eaf99a1d831017082b69d71d':
  Revert "improve TestVirtualDisplayRecycles to reduce memory usage"