Merge "AAPT2: treat manifest validation errors as warnings when asked"