Merge "sdk.atree += libbinder_ndk C++ helpers"