Merge "Allow cts-tradefed to be run with java7."