Deleted android and trustdialog branch, rebase to official master, modified for android build.