Merge pull request #994 from googolmo/dev

update android build tools to 0.5.+
Fix trailing whitespace.
Fix trailing whitespace. Again.
Prepare for 4.4.0.
[maven-release-plugin] prepare release 4.4.0