am 5c718a81: am bd8c8fa0: am 285dc61f: Merge "Update HelloComputeNDK with some additional fixes."

* commit '5c718a81f7396cd1716cc2b71684104716263e09':
  Update HelloComputeNDK with some additional fixes.