fix screenrecord abort issues

Change-Id: Ic065d4cdd92cfa7abbaafd8e17f6e9d4cf397562
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
media: Kill incessant logspam during latency measurement WTF

Change-Id: I79059c176f6c1fb922f48596bc2e078461b09320
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_frameworks_av into kk44