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

Change-Id: Iafeab5831f348cf75a62b4b018b787eb5e154273