powerd fails to properly exit because android_input_stack_stop() is hung

powerd fails to properly exit when stopped from upstart. It is hanging in android_input_stack_stop(). I set the timeout to 60 seconds and it was still killed, never getting past that call.

EDIT: If you press the power button when it's stuck in this state it will exit cleanly.

To test this, edit the powerd.conf upstart job and add "kill timeout 120" to the file, then run sudo initctl stop powerd. You can tail the syslog while you do this. Pressing power will allow the stop to continue. If you don't press the power button you will eventually get a KILL signal from the kernel (after 2 minutes if you set kill timeout, default is I think 5 seconds)