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

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

Change-Id: I4275caf65621f143b02bbc01e2642f532b1e38f9