Merge "AAPT2: Fix fully qualified java class verification"