Merge "Create all variants of stubs for sdkextensions" am: fa2d4ac85e am: 71900fc0a0

Change-Id: I12a8ec6db97c0431722be57675bfbf061b4006cc