Updated to use the latest T2AndroidLib-SG submodule