Merge "AIDL interface for servicetracker"