Merge "Track addition of new java.util APIs." am: 00d0c52470 am: c050446807 am: 43b4913836

Change-Id: I7c99241a9c13dffc28f0fad475cb1545360069fc