DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c  -s ours am: f23229f45f  -s ours
am: 6881185307  -s ours

* commit '6881185307c4f582996fb3a7792453b06857bebb':