Remove CM bring up from this branch.
Add AOSP tree from Sony.