Settings: Set untranslatable

Change-Id: I0702378bab455a7ccf95a174e36bc792d26feec8
Fix upgrade to latest proguard

Change-Id: I3fc77adc895e98673005e89bb99a38744f01bb97
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	proguard.flags