msm: mpd: Fix writeback merge conficts.

Resolves conflicts generated by the following commits:
- e256961d379c264e2fde3665dfd32fe6ce9ce9d9
- 3a7b8793f84ad3f79a52674cabb3fc69097970b8

Change-Id: I11871cb59b39b4f5445cb6c58a672fbc85488d9f