c8813q: use philz cwm by default & code clean up

Change-Id: I929af8bb1ade06f91e17b7a6c233351c3c0d9dfa