Fixed proguard issues on non-eng builds

Change-Id: Idbfd06cf53c7085081f76873894474cbdbeee874
2 files changed