Add some natives for a stub implementation of alarms
Resolve merge conflicts.
Merge branch 'marco-c-some_natives_for_alarms'