Merge "Allow CTS packages to be built with mmm rather than just mmma"