Merge "init-debug.rc: don't mount debugfs" am: 54e7365fee
am: 9a1ed6106d

Change-Id: Ie200a8068cbab8fc6c2e3cd8d620ea792aa681ea