Merge "Cleanup ISub.aidl" into lmp-dev