Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true"