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

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