Merge "Remove android.support.v7.widget.Space." into nyc-mr1-dev