* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5': Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5': Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface