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