Merge "AAPT2: Update tests to reflect new development API 'P'"