Slight reorg of android hack, with a comment update.