Merge "Remove libnativehelper directories from include_dirs"
am: 0a79f4476a

Change-Id: I1909ab2777d790d62f16aa6d021fa8001188068b