More NDK r8b fixes
More NDK r8b fixes

Change-Id: Ib91d60bc66860ad44541b28fbe89aa01d89cdee2

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core