Merge "Point directly to generated c sysprop_library" into stage-aosp-master am: a576fe427c am: e2c180d26c am: c270776927

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

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