Camera: Support obtaining camera memory from MemoryHeapIon

* Exynos 5 devices want the ION file descriptor from MemoryHeapIon

Change-Id: I9e445cf24c15713f713181667e7b7caa1a96592e
Revert "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"

This reverts commit 0debbf6b029f0967241f2c48f3136f5ae91102f7, it's apparently the cause of the recent audio buffering issues with YT across multiple platforms.

Change-Id: I917da7cafff58878918881c0fde9fb90c5096b39
Merge "Revert "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"" into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_av into cm-11.0