am 621bc533: (-s ours) am 0b3c5c50: do not merge. Move property setting from libcutils to bionic.

* commit '621bc53339c10e86d92ec89eefbb16af33229774':
  do not merge. Move property setting from libcutils to bionic.