Merge "Remove libnativehelper directories from include_dirs"