Merge "Specify a maximum value for View.MeasureSpec.makeMeasureSpec"