Revert "Fix aapt warnings"

This reverts commit 5d3c424d40b13ec5ee2a011c52c650257d4cd893.