am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.