Revert "Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICE"

This reverts commit 47c17b144f6a36d80210207288e677a1205a913c.

Until I understand all of this :)

Change-Id: I6f72913b6d9b1624c29658707b8d2657536244a5
Merge remote-tracking branch 'omni/android-5.0' into android-5.0