Merge "remove bundled services from rootdir/init.rc"