Remove folders from the override xml in email.

Change-Id: I0bc8984d47a69a37a6c5f014cf9afed13868504c
2 files changed