Merge "Remove old software avc encoder"
am: fb20749bfa

Change-Id: Iaedc1950b61aca0cb87e808606f6e743419b371d