Fix x86_64 target build

Bug: http://b/21471495
Bug: https://bugs.kde.org/id=348342
Change-Id: I5b48491d18ced37c9ecff60661fb4a5b47519219
(cherry picked from commit 22bcca76a224404fa81fff26437d15f17be56fd4)
3 files changed