0c37f926e6
Test: m fontchain_lint Test: m Test: Visual test on device after full build Bug: 110037531 Change-Id: Iac26c7c7c0e1a8a500a93f19d99831113529b201 (cherry picked from commit 77a1b149109d99ff2c73d1b8ba9a943e6961af48)