Merge "sdutil: Use new MountService api method names"