Merge "Merge "Use make variables to access java tools" am: d82b8eb5" into stage-aosp-master am: 5755757a am: 0675e1f5 Change-Id: I233540811a88aab885c3942810c27b27ed123173