Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/av into cm-10.2

Android 4.3 Release 3.1
Enable Tunnel Playback for msm8974

Change-Id: I3ca4e06f74a4e994cedaba16df3bd9b20c95bac7
cleanup media variant ifdef

Change-Id: Iedc6cfcaa6706c6614a638cede7fd560d104d8a2
Enable LPA/Tunnel audio for QCOM B-Family

Change-Id: If17b40ade698bbbccd28728bf65d8fdc3758d306
Merge "Enable Tunnel Playback for msm8974" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into jb3