[automerger skipped] Merge "Remove these subdirectories per b/133225687" am: 95ae9c0b37 am: 965240b262 -s ours
am: c4085073ab

Change-Id: Iefb32c77f4eed5a3218633633ef68622e922b8c6