Merge "ARM: VIXL32: Clean usage of scopes."
am: cce05bd825

Change-Id: Ida6a10f2b61b75c586094c1f93ef81ffffb65b85