More safely dispose Android device