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

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

Change-Id: I78426e12f0bae555c8609dd2c2c86db2a664bbf2