merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index 85c2dac..bd9421c 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -79,3 +79,5 @@
 # LOCAL_CFLAGS += -DAUDIO_WATCHDOG
 
 include $(BUILD_SHARED_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))