Merge "Miscellaneous code cleanup in audio framework"