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

* commit '285dc61f8e542cc5195dc232c25319e91c8c0aaf':
  Update HelloComputeNDK with some additional fixes.