[Oppo Find 7 and 7a] chasmodo:
Max, I can cherry pick fw/b and msm8974-common offload commits fine, but I'm getting a ton of code conflicts in fw/av.

DU's fw/av has been hauled to CM's because several devices not supported by Omni needed it.

chasmodo@razoreater ~/du/frameworks/av $ git fetch https://gerrit.omnirom.org/android_frameworks_av refs/changes/02/9402/2 && git cherry-pick FETCH_HEAD
From https://gerrit.omnirom.org/android_frameworks_av
* branch refs/changes/02/9402/2 -> FETCH_HEAD
error: could not apply c1c84a3... Squashed commit of the following:
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
chasmodo@razoreater ~/du/frameworks/av $ head
media/libmediaplayerservice/StagefrightRecorder.cpp:<<<<<<< HEAD
media/libmediaplayerservice/StagefrightRecorder.cpp:<<<<<<< HEAD
media/libmediaplayerservice/StagefrightRecorder.cpp:<<<<<<< HEAD
media/libmediaplayerservice/StagefrightRecorder.cpp:<<<<<<< HEAD
media/libmediaplayerservice/StagefrightRecorder.cpp:<<<<<<< HEAD
media/libmediaplayerservice/MediaPlayerService.cpp:<<<<<<< HEAD
media/libmedia/AudioTrack.cpp:<<<<<<< HEAD
media/libstagefright/MPEG4Writer.cpp:<<<<<<< HEAD
media/libstagefright/MPEG4Writer.cpp:<<<<<<< HEAD
media/libstagefright/MPEG4Writer.cpp:<<<<<<< HEAD
media/libstagefright/MPEG4Writer.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/OMXCodec.cpp:<<<<<<< HEAD
media/libstagefright/Utils.cpp:<<<<<<< HEAD
media/libstagefright/Utils.cpp:<<<<<<< HEAD
media/libstagefright/Utils.cpp:<<<<<<< HEAD
media/libstagefright/Utils.cpp:<<<<<<< HEAD
media/libstagefright/Android.mk:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/ExtendedUtils.cpp:<<<<<<< HEAD
media/libstagefright/include/AwesomePlayer.h:<<<<<<< HEAD
media/libstagefright/include/ExtendedUtils.h:<<<<<<< HEAD
media/libstagefright/include/ExtendedUtils.h:<<<<<<< HEAD
media/libstagefright/AudioSource.cpp:<<<<<<< HEAD
media/libstagefright/StagefrightMediaScanner.cpp:<<<<<<< HEAD
media/libstagefright/AudioPlayer.cpp:<<<<<<< HEAD
media/libstagefright/AudioPlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
media/libstagefright/AwesomePlayer.cpp:<<<<<<< HEAD
services/audioflinger/Threads.cpp:<<<<<<< HEAD
services/audioflinger/Threads.cpp:<<<<<<< HEAD
services/audioflinger/Threads.cpp:<<<<<<< HEAD
services/audioflinger/Threads.cpp:<<<<<<< HEAD
services/audioflinger/Threads.cpp:<<<<<<< HEAD
services/audioflinger/Threads.cpp:<<<<<<< HEAD
services/audioflinger/AudioFlinger.cpp:<<<<<<< HEAD
services/audioflinger/AudioFlinger.cpp:<<<<<<< HEAD
services/audioflinger/AudioFlinger.cpp:<<<<<<< HEAD
include/media/stagefright/OMXCodec.h:<<<<<<< HEAD
include/media/stagefright/OMXCodec.h:<<<<<<< HEAD
include/media/stagefright/AudioSource.h:<<<<<<< HEAD
chasmodo@razoreater ~/du/frameworks/av $

P.S. 'head' is alias for grep -r "<<<<<<< HEAD"