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

Change-Id: I9327697abd692101a56427d42b70da425b4c7e36