Merge "Fix tests: export_include_dirs." am: 94af0f2003 am: df1eaafa4d
am: 61e4ccef04

Change-Id: I5acb6e5f10e48fef29715ed49f5d0d9cee9187e4