little fixes borrowed from Chromebook kernel tree