Merge "Pin support libraries to Java 1.7 so they can be used with dx"