Merge \\\"Remove more obsolete MTD stuff.\\\" am: aa9f37185f am: e9a7f52ce5
am: c3f9902cee

Change-Id: I325e515fa91e2a42a72ffd67f97f04782c779167