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

Change-Id: I664ac757eb98ead6a28d4b4212fd8e31d3573352