Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev