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

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



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