Merge "Removes duplicate entry for /system/etc/init.d/02audio_profile" into froyo