Merge pull request #971 from jmakovicka/r1.9

Tolerate missing jnigraphics lib on Lollipop