am 9270f125: am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144e

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