Merge "API: Update Collections to OpenJDK8u60" am: 815fb54798 am: b8557c431d
am: 6a5fccdc66

Change-Id: I2636fb0fc54bbf0958b498494f4d587aa283b7d4