Merge changes from topic 'mmap_no_irq'

* changes:
  Add support for mmap stream
  audioflinger: define MMAP HAL Stream control interface

diff --cc media/libmedia/TypeConverter.cpp
Simple merge

diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge

diff --cc services/audioflinger/AudioFlinger.h
Simple merge

diff --cc services/audioflinger/Effects.cpp
Simple merge

diff --cc services/audioflinger/Threads.cpp
Simple merge

diff --cc services/audioflinger/Threads.h
Simple merge

diff --cc services/audioflinger/Tracks.cpp
Simple merge