Merge "AAPT2: better error handling for daemon mode"