am a4bd1ede: (-s ours) am 55249cd3: am 8e9a3715: am c4f6a8de: am 3cb97ec7: (-s ours) am 7c3a40b6: am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE]

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