Merge "Enable bytecode tracing in ART FI" am: 0b38d6ab37
am: ea291f209b

* commit 'ea291f209b4e3440cff7298581006881fa75bcd5':
  Enable bytecode tracing in ART FI