Merge "Add --build-variant to create_reference_dumps.py" am: d3929f3b76
am: 698fab66b0

Change-Id: I9199c284dd1d90ff8a6e42853573208c62bd61b7