Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.2

Conflicts:
	services/audioflinger/Threads.cpp

Change-Id: I928dc35934a412f405795202059fec2127f7c348
Revert "frameworks/av: Fixed framecount in AudioRecord"

This reverts commit 91a9392faf6c7e346ae87e99890b7e543ac3688b.

Conflicts:

	services/audioflinger/Threads.cpp

Change-Id: Ic0a6471961e0d149ecafa11fabbe9ad425308d22