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

Change-Id: I7a43509bc2399ccc0020933b9ecb89bdf9383889