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

Change-Id: I8206e2721f6a275737e34ecaa59ef94076f0afb5