Merge "leanback: use android attr vertical/horizontalSpacing"