am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread

* commit 'db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.