am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master

* commit '99c1a416':
  init: fix copying boot properties
  toolbox: hide property implementation from watchprops
  init: verify size of property buffers passed to property_get
  init: move the system property writer implementation
  init: switch property_get to use __system_property_get