revert changes
Merge branch 'PerfectAndroid-j' of github.com:jakdillard/platform_frameworks_base into PerfectAndroid-j