am 6025a2bc: am bd518bce: Merge changes I3187aa34,Iadac58e6

* commit '6025a2bc493534b3003ebd2ad7130366cf4f6723':
  init.rc: logd --reinit on changes to persistent properties
  logd: add reinit command