Merge "Enable cfi for 32bit arch" am: e48dccaa83

Original change: https://android-review.googlesource.com/c/platform/build/+/1627124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a1946ee284e7a4a7015de3a0cbf011effdc0e3f