am 2347d60a: Merge "Remove old build options from .gitignore"

* commit '2347d60ac02a9d0c7b1a279756f8093f3d66173a':
  Remove old build options from .gitignore