These paths have been removed per b/133225687

Bad Conflict resolution
Bug: 133225687
8 files changed