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

Change-Id: I074661952d4d8b67cdba3038f564d29329469bab