Merge "Create filegroup for sdkext file contexts"