Android p preview 5
Merge "Fix errors caught by aapt2"