Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev