Merge pull request #322 from fredrikeldh/master

Build fixes & Symbian maFillTriangleFan
MOSYNC-2670: Added -f switch to zipalign to force overwrite of existing apk
Merge pull request #324 from mattiasbybro/master

MOSYNC-2670