Test: aapt2_tests Change-Id: I815e0bfc786660d6ad70897287fb5fb21023068c Merged-In: I815e0bfc786660d6ad70897287fb5fb21023068c