Merge "Fix CtsVerifier Proguard Issues" into gingerbread