Merge "p970: Enable FM" into gingerbread