Manifest merge for ADT.

Change-Id: I635098594605af497a8b7d244e502385b8f34d1e
12 files changed