Merge "Rollback recent changes to default ProGuard files" into emu-2.0-release