am 040c53a7: am c12e5fad: am 3f980f09: Merge changes I7374d8e8,Ie344b3db

* commit '040c53a7a51f339702e721c531988de9959ceae4':
  Add user-defined cache path.
  Fix HelloComputeNDK for RS NDK API update.