Merge "Only fill methods with 0xFE on debug builds"
am: c01c1da788

* commit 'c01c1da788a1013406dde86e457348947fe9e942':
  Only fill methods with 0xFE on debug builds

Change-Id: I67390d61a2a90cd9ccdc455fe4e85b7edead4246