am 7349e63d: am 473a2708: am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev

* commit '7349e63d112838e3c925e03b6e1f99fdb95b1f6c':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]