Merge "Remove libnativehelper/include/nativehelper from include_dirs"
am: 7cc9474483

Change-Id: Id73eafdf3f0383f7873b985ec8ba3ef75e943b60