am a5c8d586: Fix build break due to layout lib.

* commit 'a5c8d586f6ceff252336f72c6e15efbf4785e794':
  Fix build break due to layout lib.