Syncing with Java 8 branch
Fixing buffer utils size fiasco