Merge "Remove libnativehelper directories from include_dirs" am: 0a79f4476a am: 83d403b80a
am: 3dad7f69c4

Change-Id: Iff049c73aa7049fed7425b9ffa2dd2ba82c8f0b7