Rebase MozStumbler PR #509 and update Android build tool versions