Merge changes Ifc818a69,I433b33d0

* changes:
  Remove windows sdk whitelist
  Remove obsolete Android.mk files