Merge "Store compiled code in Context.getCodeCacheDir()"