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

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