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 am: ad89762e am: eebe1ea1

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



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