am eaa8a6b7: am a5c8d586: Fix build break due to layout lib.

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