Merge "Making timerfd non-blocking in alarm manager."