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

Automated import of CL 146864
1 file changed