Merge "Add provided dependency scope." into gradle_0.7