Revert permission export commits (at least temporary)

Phone isn't booting after permission export
Moved "dalvik.vm.dexopt-data-only" to common.mk