fix
fix vendor/cm/proprietary being included
merge import
unimport some directories
reimport some directories
reunimport some directories. Hope I'm finally getting it right.
merge
Merge branch 'import' of https://github.com/pipcet/jordan-android into dirty