Merge "Fix proguard from stripping inner plugin classes"