some fixes for andriod
some fixes for andriod

Change-Id: I97eadc88c1737ba8b474e6786e8c1017b2cb0206

ashray/VTK-EVM,demarle/VTK,gram526/VTK,hendradarwin/VTK,ashray/VTK-EVM,sumedhasingla/VTK,demarle/VTK,keithroe/vtkoptix,hendradarwin/VTK,mspark93/VTK,berendkleinhaneveld/VTK,keithroe/vtkoptix,gram526/VTK,jmerkow/VTK,sumedhasingla/VTK,sankhesh/VTK,keithroe/vtkoptix,berendkleinhaneveld/VTK,hendradarwin/VTK,jmerkow/VTK,SimVascular/VTK,gram526/VTK,gram526/VTK,sumedhasingla/VTK,ashray/VTK-EVM,sankhesh/VTK,msmolens/VTK,berendkleinhaneveld/VTK,johnkit/vtk-dev,msmolens/VTK,keithroe/vtkoptix,johnkit/vtk-dev,jmerkow/VTK,sumedhasingla/VTK,hendradarwin/VTK,jmerkow/VTK,msmolens/VTK,sankhesh/VTK,sankhesh/VTK,jmerkow/VTK,msmolens/VTK,gram526/VTK,SimVascular/VTK,ashray/VTK-EVM,johnkit/vtk-dev,demarle/VTK,sumedhasingla/VTK,candy7393/VTK,mspark93/VTK,msmolens/VTK,jmerkow/VTK,sumedhasingla/VTK,gram526/VTK,sumedhasingla/VTK,johnkit/vtk-dev,gram526/VTK,mspark93/VTK,candy7393/VTK,johnkit/vtk-dev,mspark93/VTK,jmerkow/VTK,johnkit/vtk-dev,sankhesh/VTK,demarle/VTK,SimVascular/VTK,jmerkow/VTK,ashray/VTK-EVM,mspark93/VTK,johnkit/vtk-dev,hendradarwin/VTK,demarle/VTK,berendkleinhaneveld/VTK,gram526/VTK,candy7393/VTK,mspark93/VTK,ashray/VTK-EVM,demarle/VTK,sankhesh/VTK,msmolens/VTK,candy7393/VTK,candy7393/VTK,hendradarwin/VTK,demarle/VTK,SimVascular/VTK,keithroe/vtkoptix,sankhesh/VTK,candy7393/VTK,keithroe/vtkoptix,SimVascular/VTK,SimVascular/VTK,keithroe/vtkoptix,sankhesh/VTK,berendkleinhaneveld/VTK,mspark93/VTK,candy7393/VTK,demarle/VTK,keithroe/vtkoptix,msmolens/VTK,berendkleinhaneveld/VTK,candy7393/VTK,SimVascular/VTK,sumedhasingla/VTK,msmolens/VTK,SimVascular/VTK,ashray/VTK-EVM,ashray/VTK-EVM,berendkleinhaneveld/VTK,mspark93/VTK,hendradarwin/VTK