Merge "Add mts to build file"
am: ddc3ee1f3e

Change-Id: Ie830498da146d293c7bb523b07d764e67d09ba7a