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