Merge "Update ADT version to 23.0.6" into studio-1.0-dev