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