am a47b47a: Merge change 530 into donut

Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
  Remove obsolete activitycreator from windows SDK makefile.