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

Change-Id: I156c8298c6f1b1e044cc485f79909af088806e24