Merge commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b' * commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b': Default to UTF8 resources when packaging with aapt
Merge commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b' * commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b': Default to UTF8 resources when packaging with aapt