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

* commit 'b885435c7c77d0610f449e413766d30780eeda37':
  Update liblayout