Fixed up a couple of errors with switch to AaptCommandBuilder.
Merge pull request #376 from william-ferguson-au/issue-375

Fixed for #375 - Fixed a couple of errors with switch to AaptCommandBuilder.