Merge "Use the correct headers for header_only_library dependencies on libnativehelper."