Merge "Use make variables to access java tools" am: c2d941b862 am: 337826e3b7
am: 430467a281

Change-Id: I4b4d4dc3ff9661141c6f758c70c0168f41de036b