Merge "Only fill methods with 0xFE on debug builds" into nyc-dev
am: 6b2f0b5775  -s ours

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

Change-Id: Iaf8d934c32a2e663688a118c0ec51974d8239fb5