Merge "benchmark: Support "software" instance of codec2 service" am: af46079fc7 am: 6e47b7e024 am: 43d271edcf

Change-Id: I0d237d4290988919b39f32bd35b974819b29569d