am 3f980f09: Merge changes I7374d8e8,Ie344b3db

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