Merge change 21241 into donut

* changes:
  Layoutlib now uses the dimen status_bar_height instead of hard-coded value