Merge "Point directly to generated c sysprop_library" am: bdba7cda am: 891e2f07

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



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