Merge "Fixed energy computation for eq and bass boost" into oc-mr1-dev
am: 82d6adc7a0

Change-Id: I310acb9e2af9f180678feb3369d0bd08b14122c1