Merge "Revert "Use the platform SDK version from the config.""
am: 8f0f1757f5

Change-Id: Ida38854d79f2443f15e5121bb866f17619fd0f0a