Android SDK ADT release 12
Merge "fix fd leaking"