am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"

* commit '85a9566f7c1b9bcef150edc587a3e64b1196ffc8':
  rootfs: init.rc start logd parse error