Merge "libstagefright: Delay release of wakelock in TimedEventQueue"