The previously used enum is only used for conformance tests and
is not the one commonly used in practice - the file storage format
is the commonly used one (which also is used within Android).
Signed-off-by: Martin Storsjö <martin@martin.st>