Merge "C2SoftAvc: fix flush and map error" into pi-dev
am: a1bc17b32c

Change-Id: Ief18daad08b58107a609152aa6614f0f1b26724d