Merge "Revert "init: add ro.boot.init_rc"" am: 4c5c9db17b
am: bd8a24e292

Change-Id: I0599a01f0d46f869227330b8cdcd5542dc75a448