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

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