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

Change-Id: I58d0fd8fa128b0c8773a9fd158ae4fd9c46cd748