Merge "Call recording encoder/format choice 3/3" into kitkat3
Revert "gps: fixed singleshot session that doesn't stop"

This reverts commit a0795c656dbf4f1cf96a179673dc739c93e17986.

* It was needed on msm8660 phones, but not anymore.

Change-Id: I92b0157e8dfa434ec840478ca15fd8daff273c5d