Merge "NuPlayer: Add audio deep buffer configuration" into mnc-dev