Merge changes Ic1ce346a,Ic0b4e92c
authorAℓex Converse <aconverse@google.com>
Fri, 31 Jul 2015 19:05:54 +0000 (19:05 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 31 Jul 2015 19:05:54 +0000 (19:05 +0000)
* changes:
  Simplify model_rd_for_sb HBD ifdefs
  Simplify dist_block HBD ifdefs


Trivial merge