am 0cc09449: Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19

* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
  Store compiled code in Context.getCodeCacheDir()