feature/android ee9c0a482c8: Update Android port

[Po Lu]

branch: feature/android
commit ee9c0a482c86cab33ef149829ea02857bcdd9d8c
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Update Android port
    
    * src/sfnt.c (sfnt_normalize_blend): Don't crash when axis
    variations are not present.
---
 src/sfnt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sfnt.c b/src/sfnt.c
index 99649698557..f6730857f86 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -13582,7 +13582,8 @@ sfnt_normalize_blend (struct sfnt_blend *blend)
   /* Now, apply axis variations, but only if the avar table has the
      right number of axes.  */
 
-  if (blend->fvar->axis_count == blend->avar->axis_count)
+  if (blend->avar && (blend->fvar->axis_count
+                     == blend->avar->axis_count))
     {
       for (i = 0; i < blend->fvar->axis_count; ++i)
        {