Merge "Fix NPE and wrong behavior of Typeface.isSupportedAxes" into oc-dev