Pull request to merge recent android appdriver improvements.

We've been doing a lot of work in nicegraham's fork of appdriver, it would be nice to consolidate these changes in the "root" fork. Let us know if you have any questions.

Thanks,