Merge "Mark sdk version for conversion_toolset to system_current." am: 5a301bafb1
am: 9399efa1fe

Change-Id: I25d5949ad54050bb95c578df28fed0c04d171032