[automerger skipped] Merge "Point directly to generated c sysprop_library" am:...

[automerger skipped] Merge "Point directly to generated c sysprop_library" am: 43360b5b -s ours am: 56e442e4 -s ours am: e338ba92 -s ours am: 0ec54fde -s ours am: 6012857c -s ours

am skip reason: Merged-In If7eea235853536004e1201fd810e2552bdfc95ef with SHA-1 e4d3b998 is already in history

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



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