Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev