Merge "Update fontchain_lint to test new emoji font" into oc-dev
am: f72b0eec6e

Change-Id: Ie4e8d0621e8b5d133248f457c3a734ef035d7b80