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

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