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