Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev