Android SDK ADT release 12
Merge "Restore legacy behaviors for better compatibility"