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

* commit 'bd8c8fa0181e1980255fa51c0778a299c7c91022':
  Update HelloComputeNDK with some additional fixes.