Merge "Fix verifier/linker IncompatibleClassChangeError with hidden API" into pi-dev