AI 146863: am: CL 146862 Fix Windows SDK build.
  Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 146863
1 file changed