Revert "Use some AOKP fixes for driver + prop reconcilation"

This reverts commit d382a6f3d58868244d7f7e721f51941550020191