Merge "AAPT2: Fix references to private parent"