am 04be8136: am 30baa479: (-s ours) Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp

* commit '04be81366eb441af36017a77b28e4ab65114e88d':
  update bundled rc files to their contents from rootdir/init.rc