Merge "Fix binder_to_string.h for NDK"