Update android source + phone compat