Merge "AAPT2: Verify positional Java String format arguments in strings"