Merge "Don't inherit FM app, as it doesn't work properly with the Defy audio stack." into gingerbread