update android app.
Merge remote-tracking branch 'origin/20131004'