Clean up Defy product overrides.

Change-Id: Id56d216cf589b031c05b43c18750a57d6ad454f9
1 file changed