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

Change-Id: Ib2032449b23c79869218867c0b8fb84ce9c36299