Merge "Remove these subdirectories per b/133225687"