am a5d45f6d: (-s ours) am ca8094ba: 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 'a5d45f6d21eee960b4a57dff0a30feea26b79f87':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]