Merge "Treat uses-sdk in overlay manifests differently." into gradle_0.11