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

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

Change-Id: I4dd3fa84776d15d3641d4d64d59ce5a97a51df8a