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

Change-Id: I4440e2e7ddf0221c2b69cb2838bfa5d36d78f164