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

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