Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread