Merge "Remove referenceStaticOffsets from Class.java since it's not needed anymore."