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

* commit '3c6736b0785d3cf6c7a8cd687b9c63f9c7dea542':
  VideoCapabilities: account for block size for getAchievableRates

Change-Id: I69018ca03558a0dded94cf49508c3db042b4f12f