Merge "Fix the broken compile of a currently-not-being-compiled AWT class."