Development: Ignore directories.

 - Per https://groups.google.com/forum/#!msg/android-building/qoNNNs9Vnns/bltPQJ4EBd8J

Change-Id: If0943aae97c05024359d3bf6c5d3746341c4f892
Merge branch 'cm-12.0' into mkl