Merge "Workaorund a strange proguard and VM issue before Lollipop." into nyc-mr1-dev