Merge remote-tracking branch 'cyanogenmod/gb-release-7.2' into gingerbread-x86-monami

diff --cc Android.mk
index 943cf98,bba04e6..6e7da1a
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -43,8 -43,8 +43,9 @@@ ALL_PREBUILT += $(copy_to
  
  include $(CLEAR_VARS)
  
 +LOCAL_MODULE_TAGS := optional
  LOCAL_MODULE := libasound
+ LOCAL_MODULE_TAGS := optional
  
  LOCAL_PRELINK_MODULE := false
  LOCAL_ARM_MODE := arm