Merge "Add mts to build files"
am: 59fd7115ce

Change-Id: Ia93a39a20a19b25b89ef9fc3037bef8b683aa232