Android SDK ADT release 20
Merge "Make dex merging stateless."