Recovery Philz_touch_cwm6 changes to support janice

Change-Id: I896758e83ab7f4169da6b76b0bd2d7c8f06be041