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

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