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

Change-Id: I2bb227c4165ddb438a3020f3e4874975dc1b1368