Merge "Point directly to generated c sysprop_library" into stage-aosp-master...

Merge "Point directly to generated c sysprop_library" into stage-aosp-master am: a49fc733 am: f971f4db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19377453



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