Merge "Prefer software codec with debug property"
am: 829b2a0bf0

Change-Id: Ib5cc5065540f48efaebeb02ecd1bd8036f0e56d1