Merge "Remove libnativehelper/include/nativehelper from include_dirs"