Merge "Revert "AAPT2: Automatic Static Library Namespacing.""