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

Change-Id: I9471d54704f55400c9bf30f1fd69e926a89ffe18