am e514118e: Merge "Fix samples for 64-bit ABIs"

* commit 'e514118e03c861bd678709d7dbf671f879a44da0':
  Fix samples for 64-bit ABIs