Merge changes from topic "sysprop_library_stability" into stage-aosp-master
am: 4a0e54a53a

Change-Id: I1ed1d23be8c7f13e6d5db0d14bd878da6505afb5