Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true"
am: 96257655c5

Change-Id: I7501eda6c5fcb2c6f495cff71f068c3ec4015413