Merge "Point directly to generated c sysprop_library" into stage-aosp-master