Merge "Handler-ize InstrumentationListener and related code"
am: 0669e6f898

Change-Id: I1987baf1eb0f5be11b86dc992909fa5354b57e67