Merge "Remove old software avc encoder" am: fb20749bfa am: b808809b5f
am: 3b21344aee  -s ours

Change-Id: I1092933a14330e1d248ae5b7927ddd7e63768659