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

Change-Id: I597a230c96192ddec323b5914e1e53929e758bb2