Merge changes I13b9b1ce,I3b910c48 into msm-3.0

* changes:
  defconfig: apq8064: Enable EPM driver
  msm: Add EPM board changes for APQ8064