AAPT2: Add supported manifest elements am: 48d009ad32
am: 840beebdb4

Change-Id: I0867afb4176ccba319fbc3f47b09026696d46e0f