Merge "docs: add caution about adt in eclipse 3.6" into froyo