Merge "Update stale bazel paths to dx/dx.jar. Overwrite dx, dx.jar file unders tools/, tools/lib respectively, to the version that used to live under tools/linux/bin, tools/linux/lib respectively."