am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev

* commit 'cdc605c69597649c8e71161791ae64be48ce1f11':
  Update liblayout