Merge "Fix tests: export_include_dirs."
am: 94af0f2003

Change-Id: I7f638205a969c2862ecfc6b5a2b244089700d43e