Merge "Always use multi-dex for FrameworksServiceTests"