Merge "Temporarily suppress user-defined-warning in external/sfntly" am: a217f56dac am: f4795d699d
am: cee31ff94d

Change-Id: I9c8f891aef331a2e8d81df93d799f8356b6bd525