bump cmidi2 and choc, then update include paths (choc became sane).

Author: atsushieno

androidaudioplugin-manager/src/main/cpp/AudioBuffer.h

@@ -3,8 +3,8 @@
 
 #include "LocalDefinitions.h"
 #define AAP_MANAGER_AUDIO_QUEUE_NX_FRAMES 4
-#include <audio/choc_SampleBuffers.h>
-#include <containers/choc_SingleReaderSingleWriterFIFO.h>
+#include <choc/audio/choc_SampleBuffers.h>
+#include <choc/containers/choc_SingleReaderSingleWriterFIFO.h>
 #include <aap/android-audio-plugin.h>
 
 namespace aap {

androidaudioplugin-manager/src/main/cpp/AudioGraphNode.DataSource.cpp

@@ -1,10 +1,10 @@
 #include "AudioGraphNode.h"
 #include "AudioGraph.h"
-#include <audio/choc_AudioFileFormat_WAV.h>
-#include <audio/choc_AudioFileFormat_MP3.h>
-#include <audio/choc_AudioFileFormat_Ogg.h>
-#include <audio/choc_AudioFileFormat_FLAC.h>
-#include <audio/choc_SincInterpolator.h>
+#include <choc/audio/choc_AudioFileFormat_WAV.h>
+#include <choc/audio/choc_AudioFileFormat_MP3.h>
+#include <choc/audio/choc_AudioFileFormat_Ogg.h>
+#include <choc/audio/choc_AudioFileFormat_FLAC.h>
+#include <choc/audio/choc_SincInterpolator.h>
 
 
 class SeekableByteBuffer : public std::streambuf {

androidaudioplugin-manager/src/main/cpp/OboeAudioDeviceManager.cpp

@@ -1,7 +1,7 @@
 #include <cassert>
 #include "OboeAudioDeviceManager.h"
-#include <audio/choc_SampleBuffers.h>
-#include <containers/choc_VariableSizeFIFO.h>
+#include <choc/audio/choc_SampleBuffers.h>
+#include <choc/containers/choc_VariableSizeFIFO.h>
 #if ANDROID
 #include <aap/unstable/logging.h>
 #include <android/trace.h>