This fixes a breakage building for aosp_x86_64.

Test: mm for arm and x86 targets
Change-Id: I8305475d205106299493a9a5c1e2fc2ef8ba612b