Revert "Revert "Revert ION heap_mask changes""

This reverts commit eb7111887a812bc314a34e9735c4d2d92f30b4d9.
Revert "Revert "Revert "mm-video: vidc: Allow client to request inband video header"""

This reverts commit de4df2cad21b28f84b42a5e5c2dac1449bfe7745.
Revert "Revert "Revert "mm-video: Add support for ouput buffers color conversion."""

This reverts commit 213fbb097c67a1ce913d33e0fc353693763a7a80.
Merge pull request #1 from Dazzozo/jellybean-mr2

1