Updates to build with the recent Android changes to cmyth.