Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev