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