Merge "Fix process name for sw codec process" into qt-dev
am: cb397d7031

Change-Id: I48c8aae56c3dc875626b5fe969a5b4bf334a206c