Regen'd CLI after Amandroid addition.