371de96955
* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234': Normalize output from aapt d
* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234': Normalize output from aapt d