am 52f1b6c5: am 63049dce: am afb0b2ff: am 8c40edcd: am 236a3bb7: am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c

* commit '52f1b6c5fdf1f02886c8f961e155145d74b41b08':