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

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

Change-Id: Ib5af0d424831a85a1bf52c1c88d9c7bc223e9bbe