Merge "Use make variables to access java tools"
am: 812a59a4e5

Change-Id: I3694cf48ad78f5c13245e71df9fdba8d086084b3