Merge commit '451c850fd60aca5372810a5413636fda25d93438' * commit '451c850fd60aca5372810a5413636fda25d93438': Revise aapt options for UTF8/16 encoding
Merge commit '451c850fd60aca5372810a5413636fda25d93438' * commit '451c850fd60aca5372810a5413636fda25d93438': Revise aapt options for UTF8/16 encoding