Merge "Migrate sdkext tests to CTS" am: 3f19841dc2 am: 2ed810a56a

Change-Id: Idc89379040a0b8447198dceaf2daf465f4e2f649