[automerger skipped] Merge "Move Gallery2 over to AAPT2 and new v4 modules" am: 2813902e4e am: 2324f6d428  -s ours
am: d2caee61de  -s ours

Change-Id: Ia556e09db32faefb59ede806a2f3cf647be02a05