Remove dalvik.vm.dexopt-data-only=1...

...and add to device specific props