Merge "Use new libcore filegroup variable"