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

Change-Id: Ic686f920d55d11ca764a795ddbd5d80b6de94f55