Merge "Enable new_robolectric"