Merge "SoftXaac: Formatting changes" into pi-dev
am: d5217e613d

Change-Id: Ifdda7ab28cc7b8f7a66bae01de7083bf3202fe59