Merge "Add cfi static libraries to vendor snapshot" am: 597cd11a26

Original change: https://android-review.googlesource.com/c/platform/development/+/1382336

Change-Id: I42555f7b9c4a4387b0664cc534a3219aa8bd6feb