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

Change-Id: Ibc77173ce49b1b4132603d71aa75e98368e58382