Merge "Work around javac method reference bug"