update bin to 2.25 and seperate android from gnu repos

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>