Merge from AOSP

Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44
diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h
index 1e0af7d..0194962 100644
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@@ -38,6 +38,9 @@
     AUDIO_POLICY_OUTPUT_FLAG_DIRECT = 0x1
 } audio_policy_output_flags_t;
 
+/* for future compatibility */
+typedef audio_policy_output_flags_t audio_output_flags_t;
+
 /* device categories used for audio_policy->set_force_use() */
 typedef enum {
     AUDIO_POLICY_FORCE_NONE,