Merge "init-debug.rc: mount debugfs" am: bf6c67f234
am: 8bf6e6908b

* commit '8bf6e6908b97f785b5d7036e616438f839e9da1d':
  init-debug.rc: mount debugfs