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

Change-Id: I5e1792e11ce2bc2e7db1bcefc5b5eff48acb00ba