Merge "Point directly to generated c sysprop_library" am: bdba7cdaa3 am: 891e2f0730 am: 63f5844cc9 am: 18556ea24e am: 7b95754f91

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2119958

Change-Id: I781b893262f15c52d275d0015682cb3d09bf202a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>