am cb399d52: am d51d36fa: Windows SDK: package new tools/find_java.bat

Merge commit 'cb399d52cfae83bc4bbc4672b8728144b932c14a'

* commit 'cb399d52cfae83bc4bbc4672b8728144b932c14a':
  Windows SDK: package new tools/find_java.bat