Merge "Move Gallery2 over to AAPT2 and new v4 modules"
am: 2813902e4e

Change-Id: If3fc0641e1b6bf319936f451a85f112ef0c61769