Merge "Expose SdkExtension in the system SDK" am: 370add0c6a
am: 021426e9dd

Change-Id: Ia90e2362050bdff87495ae282ed5103b1acb1c82