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

Change-Id: I61a9444d04d3268d91ecdfb761f655114c9ac2a1