switch to lupus' modified cwm

Change-Id: I253019b4bd453e1c4c2d15df682187d6e82d171e