Updated .gitignore

Change-Id: Icc40d08beef83b7ec551bccf190451be32e4c7ba
Reformatted file structure for mixins/includes

Change-Id: Iafe531eadbbebe8258cacb882ed59ec677282823
Merge "Updated .gitignore"
Merge "Reformatted file structure for mixins/includes"