Merge "Use make variables to access java tools" am: d82b8eb5ce am: 59ddf611a1 am: 38fabb418c
am: 0ddbc507f1

Change-Id: I430ec489cacf1bd96e6ec8368278e51899bd7a4b