Merge remote-tracking branch 'upstream/cm-10.1' into HEAD

Change-Id: I10205119a537857ad1c9932c9a68f5d64be221d4
Merge https://github.com/aftersilence/android_frameworks_av into cm-10.1