Clean up
Sync with AOSX device tree #2
Merge pull request #7 from tadeas482/upstream

Sync with kumquat device tree #2