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

Change-Id: I08e6eedff692aa2be86224ffb1869e7a57182db5