Merge "Merge "Merge "Merge "Use make variables to access java tools" am: c2d941b862" into stage-aosp-master am: 8e4a5a6d6b" into oc-dev-plus-aosp am: 8410b4f9c4" into oc-dr1-dev-plus-aosp