Update for ADT r22.

Also includes update to v13 of the android support library.