Merge "Use make variables to access java tools" am: d82b8eb5ce am: 59ddf611a1
am: 38fabb418c

Change-Id: I617c5fc3b4cbd41ec2a280e435172fb4e9cc0b76