Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-release