Merge "Pin libraries needed by vogar tool to java 1.7"
am: 37478fb551

* commit '37478fb5517bff62a71778a1b58f3033c618494f':
  Pin libraries needed by vogar tool to java 1.7