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

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