Merge "JvmtiAttachingHostTest was flaky due to activity start failing" am: c43c41309f am: 0f5dbcdc71 am: cc078425eb
am: f5e571100c

Change-Id: I2efcc91c526fcf2c9644a0ee210196373d418dd6