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

Change-Id: I0731bb71e41f9b1f48e07cc71873180c7803ab7e