Merge "audioflinger and hal: Compatibility fixes for Treble"