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

Change-Id: Ic38ef61da41de68be2f9d8e6407bca88214bf324