Merge "rotate_logs: Clean up the header includes." am: 30ec005104
am: c8eba4a036

Change-Id: Ibac286ecec3c31a8aa6d1fb4cf47428c39549632