Merge "Point directly to generated c sysprop_library" into tm-d1-dev-plus-aosp