Merge "Remove vintf aidl and replace with binder"