am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

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