Merge "Add new Java 7 concurrent APIs."