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

Change-Id: I9f1899c9c533a6f8c44145f02e512dcd203fafca