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

Change-Id: Ie277afe8f32ba9ea25094bed61a1bc11488d7dd7