Android studio-1.4
Merge "Resolving a kernel-panic in windows arm executables." into studio-1.4-dev
automerge: dae8043

* commit 'dae80430f9fc492f5751cc390365ae382594b841':
  Resolving a kernel-panic in windows arm executables.