Merge "Fix redundant set codec preference to native"
am: 035a6f59dc

Change-Id: I66e5520d3ce25b07575568467f133bba9f393a66