Merge "AAPT2: Fix segfault when showing error in 9-patch" into nyc-dev