This adds some Android support in composition clients, and fixes the breakage from 2 commits ago. Thanks to Jakob for finding my error in an earlier version.