Merge "Remove old software avc encoder" am: fb20749bfa
am: b808809b5f

Change-Id: Id85003bd855316a6675f9c53575d56555f351fdc