Merge "Fix bug 2553575 API REVIEW: android.media  Change 1 of 3 Notes from API Council review:   Rename onAudioFocusChanged -> onAudioFocusChange" into froyo