Merge "Fix NPE and wrong behavior of Typeface.isSupportedAxes" into oc-dev am: 633b32be55
am: bc790383d2

Change-Id: Ie308baed43bf39394949e2fa9fc1ebab1dc98e65