Merge "Fix object header size for baker read barrier."