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: a576fe42 am: e2c180d2 am: c2707769 am: bbab2ec3

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



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