Use some AOKP fixes for driver + prop reconcilation

Okay last try for now

Change-Id: I078a879d39b89e1155f8b88ba9449d57ec57d976