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

Change-Id: I923e029d19e95a7d3c3aa5636aaeb081afa84548