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

Change-Id: I41c67bd32c046362fb2120c3ba6133d759f23ec4