Merge "ActivityInstrumentation: Migrate to new build system" into developers-dev