am 82eecaf8: am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev

* commit '82eecaf826ab06c4f3cb0716a009ff0c8ae00711':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]