Merge "Enable extservices tests to generate android-mts-extservices as well as android-mts."