Merge "Make: Don't rely on presence of tools.jar in toolchain." am: 00e3bd93da
am: bf0f0e26d7

Change-Id: I4b9b25fa35a3a4e59f47d4246a5cb8ca2efad6f1