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

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