Merge commit '9eedccd52c6a6c579edf240afd397439691057d6' * commit '9eedccd52c6a6c579edf240afd397439691057d6': Moved more ADT packages into internal.
Merge commit '9eedccd52c6a6c579edf240afd397439691057d6' * commit '9eedccd52c6a6c579edf240afd397439691057d6': Moved more ADT packages into internal.