Revert "Frameworks: Fix conflicts"

This reverts commit 152885a7866f4debd404eb9e193031ffa0ce5b20.
Revert "Frameworks: AOKP Custom Animations"

This reverts commit 6f6d7164b4b1bbfd9938e3952a606dfbcf73172a.