Merge "Only define proguard dictionary as output if obfuscating" am: 96a782f1ea am: 13c0785b09
am: 73acd38175

Change-Id: Iea98bc51e8dbeba0cb15ec460d5dda9db481b133