[Android] Backport make_apk fixes for Windows.

Backport #2423 to crosswalk-8: bring in the 3 commits from that pull
request to make everything work again on Windows.

BUG=XWALK-2567