modified Amandroid.scala
fix bugs
test on short option switch
fix sireum cli problem
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from fgwei/master

update Amandroid in Sireum-Option and CliBuilder