Merge "fix arm64 build"
am: c1ea74b6d1

Change-Id: Ie6a7d7359d3b3685ac145a5307df8a1bb9e8df2f