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

Change-Id: If19a949458e8791dfb393d9911450226a5969003