Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev am: e00bcc0fef
am: 5a92a6e074

Change-Id: Iab42acc209b1fb31d56971eb69b0140eb99e227b