msm: 8064: Fix up merge conflicts from LPM driver overhaul

* Fixes conflicts introduced by commit:
  I4f16008098c9525d3543ba23a5f58ddc3a8f942d

Change-Id: I00a1765cf241332ca3580cd2cfb2e6f35cdec3b1