Merge "Only define proguard dictionary as output if obfuscating"
am: 96a782f1ea

Change-Id: I1928c25cda47679030c06d24bc63d8d7f5024329