This fixes building with MSVC for arm. Change-Id: Iffae0408e0c68760e87e96b9e17d9df8e8cadb1a
Change-Id: I951abd4ad0078f78949f3cb79453ac334fb82a7e