Merge "Compiles wm shell against the platform APIs instead of SDK"