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

Change-Id: Id309973e3d1864af9715c62dc28cf2c023dfecae