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

* commit '9a6226dc6d4d5327767e89d7bcebba9aad253ab7':
  Fix samples for 64-bit ABIs