Merge "Added export_include_dirs in libfakeservicemanager"