Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp