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

Change-Id: I98a0c36cc428d52031ada4c43045f0bfb6bb70dc