Merge "Fix csi_x86 build failure" am: 32181a0ba4

Change-Id: I6e364dcda69e311520a1eadf897f612e8ee36cfe