Vendor Carbon - ReOrder Audio stuff [2/2]

Change-Id: I31d3b8a37a678ebcb9d00d4443c67148be6389f3
Signed-off-by: STELIX <ssspinni@gmail.com>
Merge "Vendor Carbon - ReOrder Audio stuff [2/2]" into kk