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

Change-Id: Idf231d055504d19ab963a6894fabecdd565e142e