am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144e

* commit 'a44c31cc91bce7124e896adb072a10f2740a96b4':
  toolbox: reimplement watchprops using __system_property_foreach()
  libcutils: reimplement property_list() using __system_property_foreach()