Fix error when uploading APKs to store

It seems the aapt used by the store has been upgraded to 19 which
doesn't like string resource references for android:permission
attributes. Replace the resource references with the text to fix the
issue.
Increment to version 3.2
Merge branch 'master' into foss

- Merge 3.2 changes into foss branch.