Merge "Create CSI products: csi_x86_64 and csi_arm" am: b01c09444a am: c4a3cab772 am: 66cebc6250

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1545230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaa3efe20a75c3ff38c7229c8863ee1c41371bd7