am 35da47e5: am 274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"

* commit '35da47e5d55392e6adbc97efaf181cb1dd259c04':
  libstagefright: Delay release of wakelock in TimedEventQueue