Merge "Merge "Use make variables to access java tools" am: d82b8eb5ce" into stage-aosp-master
am: 5755757a25

Change-Id: I5d3eb8395741378ed2f9df8365520fffa424f8f6