am c4cf34de: Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ub-now-mister-ugly

* commit 'c4cf34dedb5fc21fce30924105729fa3dad6aa90':
  Fix pre sdk-18 compatibility (crash in dispatchDraw)