Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"