Merge "Add cfi static libraries to vendor snapshot"