am aa00ec1a: (-s ours) am ec7e8cc9: (-s ours) do not merge. Move property setting from libcutils to bionic.

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