Cart: java7

As android supports jars with java7, we can bump the source of this
library, and introduce some java7 syntax improvements.

Only diamond operator changes for now.

ping @softarn or @mikaellothman