Merge \\\\"Remove MTD cruft from init.\\\\" am: 90db709a2f am: 80744d867f am: 77b189acd9
am: db62f10c1d

Change-Id: Ife58caa4905776992fe28374a51bf9048fdb9533