Merge "Create CSI products: csi_x86_64 and csi_arm" am: b01c09444a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I357121aeaa23493453bc9c911ece3fe2ab4754f0