Revert "Fix a bootloop problem when /data/system

…tory.xml is empty."

This reverts commit 286cba1.

AOSP just pushed 2 days ago a way better fix