Merge "Fix TODOs made during migration to libbinder_ndk" into rvc-dev