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

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

Change-Id: I30c5ac601a64c25cdc25969eca26f423f6e7e44d