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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I608f9c7ab7d4f417d59320bf2d69e1a505f12785