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

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

Change-Id: I2deb4002dfeb4c618324cb4dfd2f0876e3425f20