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

Change-Id: Ifd6f77c5e98a551dee3fc361a7f4e454a9b41e20