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

Change-Id: Id41ec3ba1004b14d41d5c8a4f79fe2a051ce58a6