Merge "Fix TODOs made during migration to libbinder_ndk" into rvc-dev am:...
Merge "Fix TODOs made during migration to libbinder_ndk" into rvc-dev am: 70d266df am: 794debeb am: a2a11a28 am: 6f379f9d
Change-Id: I66205b99fe026518750cd7869eecbc807a0e5c06