Finalise Android Trust Client implementation (Closes #1294)