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