Merge "Update time.h for android-12."