Revert "Too changes xD"

This reverts commit c81f2b623596bc0f84acd529701432a95a7a8b4f.
Revert "Moved to new AOSP Vendor"

This reverts commit acf487e204277f35152ec9c7109bfe8e9079694c.