Revert "Re-generate AllAudio.mk"

This reverts commit 5b820e5a55bc8b14a69b8753d53a51f2c9f42e94.
Fix merge

Change-Id: I4dcc95963dae73add9c64585aa449b0b62f9a36b
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/app/INotificationManager.aidl
	core/java/android/content/pm/PackageInfo.java
	core/java/android/view/KeyEvent.java
	core/jni/AndroidRuntime.cpp
	core/jni/android/graphics/BitmapFactory.cpp
	core/jni/android/graphics/Canvas.cpp
	packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	services/jni/com_android_server_BatteryService.cpp