Merge "Revert "Enable building libandroid_runtime for Windows""