am 48630d72: am 3043b188: Merge "Fix build for x86_64"

* commit '48630d72aea6bab5223eb2538c34d87c1500d7f6':
  Fix build for x86_64