Merge "Use override_export_include_dirs."
am: affd4e9bd9

Change-Id: I96856ad536505c7ee09bbdddae19b9f177c2d8f9