Merge "Copy Email proguard.flags to email2; add UnifiedEmail flags"