[DO NOT MERGE] Revert "Redefine XATTR_UUID to XATTR_UUID_V2"

Revert submission 15398814

Reason for revert: b/195477363
Reverted Changes:
I4690c21e7:Redefine XATTR_UUID to XATTR_UUID_V2
I7936fff03:Change UUID after database upgrade

Change-Id: Iaca8eda9fe65e74af79b49376b26d4544d809123
2 files changed