am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"

* commit 'faab12a0586cf4afef6fe2607bcba394c53b1d1d':
  Update time.h for CLOCK_BOOTTIME, etc