Merge "Add android.support.v7.recyclerview resource"