Merge "cpplint: restore runtime/sizeof"