AAPT2: Add the rest of supported manifest elements am: 00d5548355
am: 6ffa32f13d

Change-Id: Ie49279be2faebd550cede4d157e85d9b87502333