Merge "Pin libraries needed by vogar tool to java 1.7"