Merge "AAPT2: Fix Plural::Equals() method"