AndroidCommandHolder.java should no longer be in the repo.  get reset --hard maybe?