* commit 'f425ba2835b6e865e4dd1d4dfc2407d52f34ebde': Add better error message for AAPT file conflicts