Merge "Update weaver AIDL default to use V2"