Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp * commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3': Default to UTF8 resources when packaging with aapt
Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp * commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3': Default to UTF8 resources when packaging with aapt