Merge "Add systrace logging to ScopedCodeCacheWrite" am: 9dd26b2e68
am: dcb5aca20f

* commit 'dcb5aca20fb670e9981af92c05060e8dcd80b364':
  Add systrace logging to ScopedCodeCacheWrite