Merge "Add comments to frozen netd AIDL API files"