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

Change-Id: Ieaf0f3481d313414a462d7cacb26c17865df51ce