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

Change-Id: I945d40e7fdbdbd2fd42152a65d37542d9384e8ca