Merge changes I3a9f6385,If9f4ce09

* changes:
  Remove all files generated from configure and ignore them.
  Disable lots of unused protocols and rerun androidconfigure.