Merge "ActivityThread: Attempt to attach agent with app's classloader"