Fix arm64 build warning (promoted to error).

This refactors code that caused an warning on the arm64 build.

Change-Id: I1c0ddabb7061ea289d98b03554bf764c26256078
1 file changed