Merge "Disable Support Library dependency resolution"