am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

* commit 'c88d4c572f95a6b2397cd2c2931b1a51c673a3c8':
  Add missing dependency in layoutlib build file [DO NOT MERGE]