Android p preview 4
Merge "Move Gallery2 over to AAPT2 and new v4 modules"