Merge "Remove <cutils/tztime.h>."