Merge "AAPT2: Change accepted notation for resource names in tests"