Merge "Remove android.support.v7.widget.Space." into nyc-mr1-dev
am: 44d1049e3f

Change-Id: I049ea838501bc593c8dd181813da16f48f9da33a