Merge "Fix StackMap renaming in Java 8" into nyc-dev