Adding additional condition that the phone must be made by HTC for the setNavDump to be set to true to try and work around CB-2907, if it's still a problem on HTC devices running Android 2.2, that's just the luck of the draw.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android