revert to 4.3 sensors for testing

Conflicts:
	services/sensorservice/Android.mk
	services/sensorservice/SensorDevice.cpp

Change-Id: Ic79be5605f8fb073e0b2912dc64a2784510c90c1
complete the sensor swapout
Make Flattenable not virtual