Merge eclipse ADT support