Merge "AAPT2: Change the daemon mode to be line based"