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

Change-Id: I9f9884f5378c4edc5c07d91c76470909ad495b1d