Remove javax workaround and avoid the extra tools folder indirection

Latest tools no longer need javax libraries and the cmdline-tools folder appears to be where the tools should be placed.