Update Android/WinRT for latest changes