Android SDK tools release 12
Merge "marker to enable legacy behaviors"