Merge "init: add ro.boot.init_rc" am: 0cf5e36c00
am: 1d1b981f95

Change-Id: If7afdc62ddea990a00713c548575c945a73022e4