Revert "fix some frameworks cursor leaks"

This reverts commit 972cea8aa7a1e66dd3fcc752f8d36c126d35c582.
Derp
Revert "Derp"

This reverts commit 37e815082065a716c61b5cbc291b2e8d9ae2bb56.
cleanup
Revert "Revert "Derp""

This reverts commit f640668fd516fb822605b78e6770967b42b9c092.
Merge branch 'jbam10' of github.com:BAM-Team/android_frameworks_base into wip-jbam10