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

Change-Id: Ie32933ee52b6b81c3b51adfbe93cf176b3805198