Updated for r21 Android Tootls