Merge "Fix java.lang.Void.TYPE (void.class) initialization."