Merge "Remove last user of <cutils/tztime.h>."