Fix for android L

Stop-gap fix for Android L that now *really* wants main thread actions and worker thread callbacks.

@matthewsibigtroth