am 97a4c96f: 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 '97a4c96fbcc237f0cc1005d2502482e44c09a90c':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]