Merge "generic.mk: Replaced AlarmClock with newer DeskClock App"