Merge "Add java.time APIs."
am: 0938b22c0a

Change-Id: Ie1169d1af12228ac63f43efdf7f18e7dcb705bee