Merge "Fix proguard rule for CtsCurrentApiSignatureTestCases"