Merge "Add --keyinputv2 and --motioninput options to genfakedata."