FW_Base - ReOrder Audio stuff [1/2]

Change-Id: I9fb3c647727bf9f9223e2e0caf701b04dfc97b16
Signed-off-by: Stefano Mura [STELIX PippoX3] <ssspinni@gmail.com>
Merge "FW_Base - ReOrder Audio stuff [1/2]" into kk