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

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



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