Merge "Remove these subdirectories per b/133225687"
am: 95ae9c0b37

Change-Id: Ia7d1cd70105fa2b40c77e226bdc2f8d4e2f63a0e