Use aapt rename

Fix #465
Merge pull request #466 from bootstraponline/aapt_rename

Use aapt rename