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

Change-Id: I87bab7e4eaf7fe7326465348c7ad027883154b57