Merge "Fix errors caught by aapt2"