Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h"