Fix java test classpath to have the same ordering as java binary

Created by: romanoid

Fixing https://github.com/facebook/buck/issues/1830 using option # 1 described there.

This replaces https://github.com/facebook/buck/pull/1841