Merge "init: add ro.boot.init_rc" am: 571cd23fa8
am: fc8f2db476

Change-Id: I9ab39983a551e9f13a6d163a9f0fa2efd904db0f