[automerger skipped] Merge "Remove these subdirectories per b/133225687" am: 95ae9c0b37
am: 965240b262 -s ours
am skip reason: SHA1 965240b262 skipped by user baligh

Change-Id: Ie5271a5cd3092bfc5c08229adb788154f7bfb0fa